03927cbd2e58f2126539fd886be32b4658ab0c56,graylog2-server/src/main/java/org/graylog2/inputs/InputServiceImpl.java,InputServiceImpl,findForThisNodeOrGlobal,#String#String#,94

Before Change



    @Override
    public Input findForThisNodeOrGlobal(String nodeId, String id) throws NotFoundException {
        List<BasicDBObject> query = new ArrayList<BasicDBObject>();
        query.add(new BasicDBObject("_id", new ObjectId(id)));

        List<BasicDBObject> forThisNodeOrGlobal = new ArrayList<BasicDBObject>();
        forThisNodeOrGlobal.add(new BasicDBObject("node_id", nodeId));

After Change


                new BasicDBObject(MessageInput.FIELD_NODE_ID, nodeId),
                new BasicDBObject(MessageInput.FIELD_GLOBAL, true));

        final List<BasicDBObject> query = ImmutableList.of(
                new BasicDBObject("_id", new ObjectId(id)),
                new BasicDBObject("$or", forThisNodeOrGlobal));

        final DBObject o = findOne(InputImpl.class, new BasicDBObject("$and", query));
        return new InputImpl((ObjectId) o.get("_id"), o.toMap());